# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1174+1.1069.1.252 -> 1.1175 # include/asm-ia64/page.h 1.6.1.4 -> 1.13 # include/asm-ia64/processor.h 1.16.3.9 -> 1.31 # arch/ia64/kernel/salinfo.c 1.11.1.4 -> 1.16 # arch/ia64/kernel/signal.c 1.7.1.7 -> 1.15 # diff -Nru a/include/asm-ia64/page.h b/include/asm-ia64/page.h --- a/include/asm-ia64/page.h Thu Mar 4 16:25:58 2004 +++ b/include/asm-ia64/page.h Thu Mar 4 16:25:58 2004 @@ -59,6 +59,7 @@ #endif #define RGN_MAP_LIMIT ((1UL << (4*PAGE_SHIFT - 12)) - PAGE_SIZE) /* per region addr limit */ + #ifdef __ASSEMBLY__ # define __pa(x) ((x) - PAGE_OFFSET) # define __va(x) ((x) + PAGE_OFFSET)